-
Notifications
You must be signed in to change notification settings - Fork 154
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upstream sync #282
Merged
Merged
Upstream sync #282
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
c4 is reduced to 2 from 4 and the bundle to 12 from 20
Co-authored-by: coolmankid12345 <[email protected]>
* change rotations of botany tools * change gas tank wide swing rotation
* start work * remove crafting things * remove * fix yml * remove all pebbles add sand stone add sand cobblestone wall add asteroid cobblestone wall resprite basaltand snow walls * add new walls *
* added more slang to the sanitization manager * idk why this file is here * Added new sanitization accent * No longer is an acccent, instead is a dictionary * Reverted back to a system similar to before, added the new netspeak from the dictionary * Added some new words to the chat san * Added (wdym --> what do you mean) to the chatsan * merge conflict * removed boolvalue * remove space * Upcoming * Added MF and ETC to chatsan :)) * upcoming * added FYI and WYD to speech-chatsan.ftl * Made the chatsan accent string a const string with [ValidatePrototypeId<AccentPrototype>] * forgot the ';' :((( * fixed error throw [AccentPrototype] --> [ReplacementAccentPrototype]
* This was supposed to be a challenge * Component magik * Add documentation
…es, add [player] completion hint (#21152)
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Added sprites * Added item in game * Ditched glowing light indicator to simplify implementation * Added clipboard to locker fill * Added traitor objective * forgor meta.json * forgor clip textures on front-facing in-hand sprites * lowered concussiveness of bureaucracy * added remote cargo ordering, paper sucking, and removed paper on spawn * slightly reduce storage capacity so it can fit in backpacks
Rxup
approved these changes
Oct 22, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.